Refactoring, made filtering more generic
Organizing files and folders in project