Reverted settings

Reverted settings, also fixed BASE_PATH