Added the latest changes from HasenTag

Applied the changes manually as the directories have been renamed.