Database refactoring completed(for now) to suit the needs of applying