Changed from *.hpp
Rearranging the architecture