Moved everything to single source directory