Code tweaks
Move TestCase
Move some classes
Move controller abstracts