Sorted code into h files