Restructure into a single project