Removed statics
Cleaned and organised FileManager class