Reorganized Files and added custom ListView