Changed folder structure and moved from maven entirely