Organized function files better into one folder with original subfolders. Changed references to new file locations. Moved some code and triggers around.