Removed unnecessary Layer and Engine classes.