minor changes in directory structure

moved /bootstrap and /font-awesome folders to basic_includes