Bringin some order to the project :)