Restructure to better separate compiled files to source files