rework file structure to 'be more mvc'