Directory reorganization, universal build target for static lib project