restructure of project layout