diff --git a/synfig-studio/Makefile.am b/synfig-studio/Makefile.am
index 2bed470..2774f23 100644
--- a/synfig-studio/Makefile.am
+++ b/synfig-studio/Makefile.am
@@ -28,6 +28,7 @@ SUBDIRS = \
build_tools \
src \
images \
+ plugins \
po
EXTRA_DIST = \
diff --git a/synfig-studio/configure.ac b/synfig-studio/configure.ac
index d1fd925..6f60089 100755
--- a/synfig-studio/configure.ac
+++ b/synfig-studio/configure.ac
@@ -292,8 +292,8 @@ src/synfigapp/Makefile
images/Makefile
win32inst.nsi
pkg-info/macosx/synfig-studio.info
-src/plugins/Makefile
-src/plugins/add-simple-skeleton/Makefile
+plugins/Makefile
+plugins/add-simple-skeleton/Makefile
])
AC_OUTPUT
diff --git a/synfig-studio/plugins/Makefile.am b/synfig-studio/plugins/Makefile.am
new file mode 100644
index 0000000..29c75ad
--- /dev/null
+++ b/synfig-studio/plugins/Makefile.am
@@ -0,0 +1,6 @@
+# $Id$
+
+MAINTAINERCLEANFILES = Makefile.in
+
+SUBDIRS = \
+ add-simple-skeleton
diff --git a/synfig-studio/plugins/add-simple-skeleton/Makefile.am b/synfig-studio/plugins/add-simple-skeleton/Makefile.am
new file mode 100644
index 0000000..ac38fea
--- /dev/null
+++ b/synfig-studio/plugins/add-simple-skeleton/Makefile.am
@@ -0,0 +1,13 @@
+# $Id$
+
+MAINTAINERCLEANFILES = Makefile.in
+
+PLUGIN_NAME = add-simple-skeleton
+
+EXTRA_FILES = stickman.sif
+
+plugindir = ${datadir}/synfig/plugins/$(PLUGIN_NAME)
+plugin_DATA = \
+ $(PLUGIN_NAME).py \
+ plugin.xml \
+ $(EXTRA_FILES)
diff --git a/synfig-studio/plugins/add-simple-skeleton/add-simple-skeleton.py b/synfig-studio/plugins/add-simple-skeleton/add-simple-skeleton.py
new file mode 100755
index 0000000..a34f77f
--- /dev/null
+++ b/synfig-studio/plugins/add-simple-skeleton/add-simple-skeleton.py
@@ -0,0 +1,73 @@
+#!/usr/bin/env python
+
+import os
+import sys
+
+def check_substring(data, substring):
+ s = "\n".join(data);
+ if substring in s:
+ return True
+ return False
+
+def process(filename):
+ def merge_defs():
+ defs=False
+ for l in template_contents:
+ if defs:
+ if not "" in l:
+ inputfile_f.write(l)
+ else:
+ break
+ elif "" in l:
+ defs=True
+
+ template_filename = os.path.join(os.path.dirname(sys.argv[0]), 'stickman.sif')
+
+ template_f = open(template_filename, 'r')
+ template_contents = template_f.readlines()
+ template_f.close()
+
+ # Read the input file
+ inputfile_f = open(filename, 'r')
+ inputfile_contents = inputfile_f.readlines()
+ inputfile_f.close()
+
+ # Now write results to the same file
+ inputfile_f = open(filename, 'w')
+
+ num=1
+ while check_substring(inputfile_contents, '(stk%s' % num):
+ num+=1
+
+ for i, line in enumerate(template_contents):
+ template_contents[i] = line.replace('(stk','(stk%s' % num)
+
+ defs_found=False
+ for line in inputfile_contents:
+ if "" in line:
+ defs_found=True
+ merge_defs()
+ if line == "\n":
+ if not defs_found:
+ inputfile_f.write("\n")
+ merge_defs()
+ inputfile_f.write("\n")
+ canvas=False
+ for l in template_contents:
+ if canvas:
+ if not l == "\n":
+ inputfile_f.write(l)
+ else:
+ break
+ elif "" in l:
+ canvas=True
+ inputfile_f.write(line)
+
+ inputfile_f.close()
+
+if len(sys.argv) < 2:
+ sys.exit()
+else:
+ process(sys.argv[1])
+
+
diff --git a/synfig-studio/plugins/add-simple-skeleton/plugin.xml b/synfig-studio/plugins/add-simple-skeleton/plugin.xml
new file mode 100644
index 0000000..22800d2
--- /dev/null
+++ b/synfig-studio/plugins/add-simple-skeleton/plugin.xml
@@ -0,0 +1,5 @@
+
+
+ Simple Skeleton
+ add-simple-skeleton.py
+
diff --git a/synfig-studio/plugins/add-simple-skeleton/stickman.sif b/synfig-studio/plugins/add-simple-skeleton/stickman.sif
new file mode 100644
index 0000000..0f7cbf3
--- /dev/null
+++ b/synfig-studio/plugins/add-simple-skeleton/stickman.sif
@@ -0,0 +1,6382 @@
+
+
diff --git a/synfig-studio/src/Makefile.am b/synfig-studio/src/Makefile.am
index ac974b7..4bc8c6e 100644
--- a/synfig-studio/src/Makefile.am
+++ b/synfig-studio/src/Makefile.am
@@ -8,5 +8,4 @@ EXTRA_DIST = \
SUBDIRS = \
synfigapp \
- plugins \
gui
diff --git a/synfig-studio/src/plugins/Makefile.am b/synfig-studio/src/plugins/Makefile.am
deleted file mode 100644
index 29c75ad..0000000
--- a/synfig-studio/src/plugins/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-# $Id$
-
-MAINTAINERCLEANFILES = Makefile.in
-
-SUBDIRS = \
- add-simple-skeleton
diff --git a/synfig-studio/src/plugins/add-simple-skeleton/Makefile.am b/synfig-studio/src/plugins/add-simple-skeleton/Makefile.am
deleted file mode 100644
index ac38fea..0000000
--- a/synfig-studio/src/plugins/add-simple-skeleton/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-# $Id$
-
-MAINTAINERCLEANFILES = Makefile.in
-
-PLUGIN_NAME = add-simple-skeleton
-
-EXTRA_FILES = stickman.sif
-
-plugindir = ${datadir}/synfig/plugins/$(PLUGIN_NAME)
-plugin_DATA = \
- $(PLUGIN_NAME).py \
- plugin.xml \
- $(EXTRA_FILES)
diff --git a/synfig-studio/src/plugins/add-simple-skeleton/add-simple-skeleton.py b/synfig-studio/src/plugins/add-simple-skeleton/add-simple-skeleton.py
deleted file mode 100755
index a34f77f..0000000
--- a/synfig-studio/src/plugins/add-simple-skeleton/add-simple-skeleton.py
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/usr/bin/env python
-
-import os
-import sys
-
-def check_substring(data, substring):
- s = "\n".join(data);
- if substring in s:
- return True
- return False
-
-def process(filename):
- def merge_defs():
- defs=False
- for l in template_contents:
- if defs:
- if not "" in l:
- inputfile_f.write(l)
- else:
- break
- elif "" in l:
- defs=True
-
- template_filename = os.path.join(os.path.dirname(sys.argv[0]), 'stickman.sif')
-
- template_f = open(template_filename, 'r')
- template_contents = template_f.readlines()
- template_f.close()
-
- # Read the input file
- inputfile_f = open(filename, 'r')
- inputfile_contents = inputfile_f.readlines()
- inputfile_f.close()
-
- # Now write results to the same file
- inputfile_f = open(filename, 'w')
-
- num=1
- while check_substring(inputfile_contents, '(stk%s' % num):
- num+=1
-
- for i, line in enumerate(template_contents):
- template_contents[i] = line.replace('(stk','(stk%s' % num)
-
- defs_found=False
- for line in inputfile_contents:
- if "" in line:
- defs_found=True
- merge_defs()
- if line == "\n":
- if not defs_found:
- inputfile_f.write("\n")
- merge_defs()
- inputfile_f.write("\n")
- canvas=False
- for l in template_contents:
- if canvas:
- if not l == "\n":
- inputfile_f.write(l)
- else:
- break
- elif "" in l:
- canvas=True
- inputfile_f.write(line)
-
- inputfile_f.close()
-
-if len(sys.argv) < 2:
- sys.exit()
-else:
- process(sys.argv[1])
-
-
diff --git a/synfig-studio/src/plugins/add-simple-skeleton/plugin.xml b/synfig-studio/src/plugins/add-simple-skeleton/plugin.xml
deleted file mode 100644
index 22800d2..0000000
--- a/synfig-studio/src/plugins/add-simple-skeleton/plugin.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
- Simple Skeleton
- add-simple-skeleton.py
-
diff --git a/synfig-studio/src/plugins/add-simple-skeleton/stickman.sif b/synfig-studio/src/plugins/add-simple-skeleton/stickman.sif
deleted file mode 100644
index 0f7cbf3..0000000
--- a/synfig-studio/src/plugins/add-simple-skeleton/stickman.sif
+++ /dev/null
@@ -1,6382 +0,0 @@
-
-