Bootstrap cleanup + begining of solving of a bug with installing on a subdirectory