Changed up file structure