Fixed scoping issue with BENCH macro and removing build folder from src ctrl