diff --git a/.gitignore b/.gitignore
index 1c68487..039ef30 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,15 @@
-/persistence-app/target/
-/persistence-jpql/target/
+# maven
+target/
+
+# java classes
+*.class
+
+# eclipse
+.project
+.classpath
+.settings
+
+# netbeans
+nb-configuration.xml
+nbactions*.xml
+
diff --git a/persistence-app/.classpath b/persistence-app/.classpath
deleted file mode 100755
index 5f6797b..0000000
--- a/persistence-app/.classpath
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/persistence-app/.gitignore b/persistence-app/.gitignore
deleted file mode 100755
index ea8c4bf..0000000
--- a/persistence-app/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/target
diff --git a/persistence-app/.project b/persistence-app/.project
deleted file mode 100755
index db865f3..0000000
--- a/persistence-app/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>pers1</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-	</natures>
-</projectDescription>
diff --git a/persistence-app/.settings/org.eclipse.jdt.core.prefs b/persistence-app/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 443e085..0000000
--- a/persistence-app/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.7
diff --git a/persistence-app/.settings/org.eclipse.jpt.core.prefs b/persistence-app/.settings/org.eclipse.jpt.core.prefs
deleted file mode 100644
index 3e2d239..0000000
--- a/persistence-app/.settings/org.eclipse.jpt.core.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jpt.core.platform=generic
-org.eclipse.jpt.jpa.core.discoverAnnotatedClasses=true
diff --git a/persistence-app/.settings/org.eclipse.m2e.core.prefs b/persistence-app/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f..0000000
--- a/persistence-app/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/persistence-app/.settings/org.eclipse.wst.common.project.facet.core.xml b/persistence-app/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index 25c3776..0000000
--- a/persistence-app/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
-  <installed facet="java" version="1.7"/>
-  <installed facet="jpt.jpa" version="1.0"/>
-</faceted-project>
diff --git a/persistence-app/target/classes/META-INF/MANIFEST.MF b/persistence-app/target/classes/META-INF/MANIFEST.MF
deleted file mode 100755
index ab49e8d..0000000
--- a/persistence-app/target/classes/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,5 +0,0 @@
-Manifest-Version: 1.0
-Built-By: kalaz
-Build-Jdk: 1.7.0_51
-Created-By: Maven Integration for Eclipse
-
diff --git a/persistence-app/target/classes/cz/fi/muni/pa165/DaoContext.class b/persistence-app/target/classes/cz/fi/muni/pa165/DaoContext.class
deleted file mode 100755
index 7065540..0000000
Binary files a/persistence-app/target/classes/cz/fi/muni/pa165/DaoContext.class and /dev/null differ
diff --git a/persistence-app/target/classes/cz/fi/muni/pa165/entity/Cage.class b/persistence-app/target/classes/cz/fi/muni/pa165/entity/Cage.class
deleted file mode 100755
index 6f35164..0000000
Binary files a/persistence-app/target/classes/cz/fi/muni/pa165/entity/Cage.class and /dev/null differ
diff --git a/persistence-app/target/classes/cz/fi/muni/pa165/entity/Pet$PetColor.class b/persistence-app/target/classes/cz/fi/muni/pa165/entity/Pet$PetColor.class
deleted file mode 100755
index 3c4ac3e..0000000
Binary files a/persistence-app/target/classes/cz/fi/muni/pa165/entity/Pet$PetColor.class and /dev/null differ
diff --git a/persistence-app/target/classes/cz/fi/muni/pa165/entity/Pet.class b/persistence-app/target/classes/cz/fi/muni/pa165/entity/Pet.class
deleted file mode 100755
index 3167158..0000000
Binary files a/persistence-app/target/classes/cz/fi/muni/pa165/entity/Pet.class and /dev/null differ
diff --git a/persistence-container/.classpath b/persistence-container/.classpath
deleted file mode 100755
index 5f6797b..0000000
--- a/persistence-container/.classpath
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/persistence-container/.gitignore b/persistence-container/.gitignore
deleted file mode 100755
index ea8c4bf..0000000
--- a/persistence-container/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/target
diff --git a/persistence-container/.project b/persistence-container/.project
deleted file mode 100755
index 77ca19e..0000000
--- a/persistence-container/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>persistence-container</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-	</natures>
-</projectDescription>
diff --git a/persistence-container/.settings/org.eclipse.jdt.core.prefs b/persistence-container/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 443e085..0000000
--- a/persistence-container/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.7
diff --git a/persistence-container/.settings/org.eclipse.jpt.core.prefs b/persistence-container/.settings/org.eclipse.jpt.core.prefs
deleted file mode 100644
index 3e2d239..0000000
--- a/persistence-container/.settings/org.eclipse.jpt.core.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jpt.core.platform=generic
-org.eclipse.jpt.jpa.core.discoverAnnotatedClasses=true
diff --git a/persistence-container/.settings/org.eclipse.m2e.core.prefs b/persistence-container/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f..0000000
--- a/persistence-container/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/persistence-container/.settings/org.eclipse.wst.common.project.facet.core.xml b/persistence-container/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index 25c3776..0000000
--- a/persistence-container/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
-  <installed facet="java" version="1.7"/>
-  <installed facet="jpt.jpa" version="1.0"/>
-</faceted-project>