cleaned up project folder structure