Restructured project for a little beauty