Restructured the directory structure as per Gradle standards