More energies and restruct. of directories