Changed directory structure to accommodate use of other languages