Changed folder structure, fixed class invocations across the project.