refactored to have multiple folders and added new project