Restructured project. Focus still not working