Restructured project to make it neater