Restructured folder to make things easier