Restructured directories

Changed directory structure to work better with conditional
compatibility model