Revert "Compacted things + removed unneccessary files (They are in old)"

This reverts commit b3eb7a0469674beb4e77f772225a5023a2f85bee.