Modify Projectstructure, add basic classes and there test's