* Further refactoring
* Improved directory structure