refactored independent modules into lib and include directores
added build directory macro