Mini push

Restructure and organize file contents now instead of later.