Rearranged include and lib folders

TODO: fix android build
Fixed android and linux makefiles

TODO: Check linux build
Merge remote-tracking branch 'origin/develop' into develop