added Entity and Layer modules