File structure refactoring

@thedansimonson