Start adding support files
Re-org and cleanup