Cleaned up filesystem so not so many folders