Files restructured. Ready to be cloned