Rerranged files and readded theme