Reorganized and renamed files. Code fully integrated.