Cleaned up files and set up boiler plate structure