fixed all tables and initial setup, removed unused files