Code Separation and updates

Added some player-enemy interaction.