Removed Unused Package
Refactored to use Model and Database folders