refactored Code, added Projectfolders, added Javacode, cleaned up some mess