Synced with competition branch on the updates; deleted uneccessary folders