Changed project structure, using actual folders making it easier to navigate