improve: restructure directories