Restructured project for better cloning usability