Updated Security, restructured models & views
Split User model into base and user class