File structure change

Changed file structure to better work with maven/jenkins