Code Cleanup and directory structure fix.