Cleanup code. Removed unnecessary folders