Move relevant code to subdirectory for proper package naming