Restructured buildFile for password