Changed directory structuer for easier Eclipse imports