Organized classes into files, moved old code