Adding Working Test + Renaming packages and interfaces