Removed bar from makefile
Renamed bar folder (again)