Small refactor, got rid of the redundant directory