refactoring the structure class
Merge branch 'DatabaseServer' of https://github.com/skiadas/PanthR into DatabaseServer