Added .jar file, cleaned structure