Moving things around; small refactoring

No need to keep things in their folder when they're the only file inside