Merge preparation - removed unnecessary folders, corrected faulty configuration