move towards more component based design

changes ennumerable. components and systems and tidying added