Refactoring duplicate folder; Bugfixes for Base Path and FileObject