Start splitting code up into logical layers
File names switched to match planned conventions.