Reorganized folders, created table and drop table methods