Moved some headers to appropriate folder.