Added some commands for non root users, needs testing.
Tested Makefile and restored example paths