Move implementation to correct folder