Reorganized folders and updated functional specs

Bryan