Fixed the load and save bugs, also restructed the repo