Major file movement
style cleanup