CSS organization, moved to new system