Started reworking censore and server.js structure
merge
merge