Changed folder structure to comply with Maven standards