Remove test program
Moved source
Fix formatting