Reorganized project and made some updates to fix somethings after Assets table redefinition.