Fixed issues with reorganization

Some files were placed in the wrong folder, so I moved them. Also fixed
the error related to the Conditional Select dialog unable to open
because it was looking in the wrong place for its icon.