moved variables instances into static class containers for structuring