Moved admin controllers and views to separate package
Deleted junk files views & controllers
merged conflict files