Intermediate commit for a lot of fixes and restructuring.
Fixed several errors related to file hierarch restructuring.
Merge branch 'master' of https://github.com/Smoss/autopsy