Refactoring

Moving into folders