Issue #1. Remove unnecessary folders