Removed and renamed some files, and moved methods around to appropriate locations.