Moved shit around to make more sense, updated project