Datastructure changes

Added a "src" directory to get a better structure