mk src folder and tidy up the names