Renamed base directories

* Renamed base directories.
* Improvements in Build System