fixed include and lib
added layout of files
Added Entity classes