WIP
Major refactor of files