Implement project restructure