Reworking overall code structure