Moved hpp files into src location