Removing useless directory
A bit of refactoring Volume 2.