Removed useless code.
Added additional files.