Feature #44, fixed problems after re-structuring project