Removed unused files and changed Package Structure