Restructuring

Major code/file restructuring.