Applied folder naming conventions
Improved build system