Restructured files, added includes