Some minor code fixes, first draft move, and removed obj folder