#44 - Reorganize content from old Local module