Removed old files.
Added control structures.