Organized files and imports

Just trying to organize this right, weighing complexity over flexibility.