Rework projects
Changes for testing