Re-arranged File Paths

Re-arranged file paths and build locations