Completed the major part of code

Use CG to draw the components
Removed old files
?