Beautify structure. Include dir and lib dir

Signed-off-by: schaeferpp <schaefer.pp@gmail.com>