Restructure project and deployment