Changed structure to facilitate include directory