Changed package names
Renamed Database to the more specific FileDB to enable better name for Database abstraction down the line
Removed unnecessary classes
Optimized imports