Moving files around + some refactoring.