[TASK] Changed logging
[FEATURE] Made filesystem simpler (moved logic out)