Restructured the project and compiled it under 4.3