Changed folder structure to work with Eclipse