Project structure rearranged
more rearranging