Change the structure of this little project