Removed unnecessary files, rearranged dir structure