Made file structure better and like the FIRST api, started working on loading