base bug fixed
rearranging project structure