Shannon - rearranging files
Shannon - more file rearranging, for maven and deployment to server