Clean up spaces and format
Moved skeleton src files to /app