added Entity directory / small changes