Changed folder structure to work with gradle