organization and update on location
Merge branch 'master' of https://github.com/rafmagns-skepa-dreag/fbim.git