tidy up
move main source to master