Minor file hierarchy change