Added my shit and got rid of package declarations