fixed lint + cleaned up folders