Restructure project and files