Removed unnecessary files and re-organized file path and naming.