Restructured project, much better