Yet another shift in file structure, trying to get more inline with best practices.