Cleaned up working dir, moved source to src folder
Cleaned up working dir, moved source to src folder