Remove seperator UI control
Move core classes to dedicated folder